Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 10 Apr 2006 15:36:03 +0000 (16:36 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 10 Apr 2006 15:36:03 +0000 (16:36 +0100)
commit224cab0dfd3e7696fec21acf5e0cd821328fbe49
treed162a66094c2f8c5dbe26fc5dd0a84675c7de998
parent02e0e0d9bb791264722682d5dc26691e3a338803
parent9ffd98fa29fd8dc997529fa120d25446dbbc1bdd
Merged.